branchbefore/main/Progression Reworkcancel